3fdd0e0213eb3337f968262a1fe1e3bdcd93c7f4,modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/util/impl/DDMImpl.java,DDMImpl,getDDMFormFieldsJSONArray,#DDMForm#String#,738

Before Change


	protected JSONArray getDDMFormFieldsJSONArray(
		DDMForm ddmForm, String script) {

		if (Validator.isNull(script)) {
			return null;
		}

		JSONArray defaultDDMFormFieldsJSONArray = null;

		if (ddmForm != null) {
			defaultDDMFormFieldsJSONArray = getDDMFormFieldsJSONArray(
				ddmForm.getDDMFormFields(), ddmForm.getAvailableLocales(),
				ddmForm.getDefaultLocale());
		}

		try {
			DDMForm scriptDDMForm = _ddmFormJSONDeserializer.deserialize(
				script);

			return getDDMFormFieldsJSONArray(
				scriptDDMForm.getDDMFormFields(),
				scriptDDMForm.getAvailableLocales(),
				scriptDDMForm.getDefaultLocale());
		}
		catch (PortalException pe) {
			if (_log.isWarnEnabled()) {
				_log.warn("Unable to deserialize script", pe);
			}

			return defaultDDMFormFieldsJSONArray;
		}
	}

After Change


				ddmForm.getDDMFormFields(), ddmForm.getAvailableLocales(),
				ddmForm.getDefaultLocale());
		}
		else if (Validator.isNotNull(script)) {
			try {
				DDMForm scriptDDMForm = _ddmFormJSONDeserializer.deserialize(
					script);